Modfiy some model classes