Changed visibility of some methods and added getter/setters to provide better extension possibilities