some changes to Schedule Model