UPDATE do silent bd mapping and removed unused mapping for sourcing