Fixed Model to comply with OOP style