Site 386 - Refactored the way that models are defined