Adding timezone and multisite support