Guard model added
schema fixed