Added some methods to improve the handling of auto_mapping feature