Added controlers and search