Added OO handling