Modularize models and forms for future expansion