Implemented some more getter/setter methods