Added controller and db config