Changed to use getters and setters