Extended the Schedules, now it should cover all means of usage