Add controllers to better deal with concerns