Added functionality for pre-server data parsing