Fixing the rest of the syntax
Another fix for the models