add new controllers; update models