Added TimeInterval and Schedule to factory