OOP structer has been added