Amended Property controller and added Unit controller