Added ability to extend also DataObjects