Switch to better property syntax