added mappings to autoload and option to disable them
removed comment