Tweaks to the models to get associations to work