Refactored model code to accommodate private static members on models.