Refactor TimeFactory to have getter/setter