Added controller and domain