Add timepicker addon, refactoring