Adjusted the Populate Cli to work with the new mappers and the base Cli script