Added time picker support / refactoring