Add option to include under and overflow bins