Adding month support
Removing stub for time