Add support to more maps