Another step to fix binding;
merged data and rest module in one;