Fixing getters.
Moving time options into separate class.