Now using getters and setters for safety