Adding some further functionality and encapsulation
Adding some further functionality and encapsulation