Fixed parse_data to be more admin friendly