Changed model methods to class methods