Launch file cleanup
Add empty map support