Replaced get/set with simple properties