Refactored data stores to better deal with schedule and job expiration

Refactored data stores to better deal with schedule and job expiration #407