Add some columns and allow timezone configuration

Add some columns and allow timezone configuration