Added some getters and setters