Added setters to non-