Mark some fields as non-null
Moved models file
The session slot can be in place