[Time] Add and fix features