Added timezone and extra functions to model