Moved parsing logic to server