Refactoring Mod models, needs to support extras.