DataItemExtension changes and small improvements.