Adding some OO design