Better models for scheduler. Still having an issue with inheritance.