Adding separation of preprocessings and server