[BUGFIX] Fix wrong method skeleton
[BUGFIX] Add more conditional checks for the Model command