Added support for Chateau, Estate and Villa.