Refactored dipls models, added associations