Changed naming convention
Added schedule collection