Modified user and shift schemas