- Added changes required to take the advantage of new arch and data