Add mapping option and autoload function