Modify controller & models