Added data parser