Break PropertyController in two.