added data items, small refactoring