Updated API controllers and DAO's