Map subsystem added