Adjust some model methods