Changed Data Pre-process to server side