Switched to automatic setter and getter construction