Proper Hierachy logic and more space in db for timepicks