Added more helper functions
Removed unused use statement
Minor tweaks
Added model relationship assertions