Adding Object Oriented Structure