Added {WEEK_OF_MONTH} and {WEEK_OF_YEAR}