Small changes in getter setter methods