Added more units to be converted.
Refactoring - DatePattern