Stopped model being loaded when not needed