Updated models to include job shifts