Now with more getters and setters