time sub dict refactored