Move this into a beforeModel hook
Move this into a beforeModel hook