--HR-396 Modification to add configuration for hours per week/month/year and some tweaks