new data strcture refactoring without remote mapping