Added maps and raw data output