Reverted some model changes