Add object-orientation