Data render refactoring, some bugs inside