Adds support for multiple maps