Refactored models to not use closures for methods to improve performance.