Fixed models being loaded/defined more than once