Added options flag to choose if you want to use credit mapping or not