Added the domain class and controllers again