Updated config and controllers