Add initial support for time control