Fixed TimeEntry Optional Params
Changed imports to match classes