Added more support for generating timecards