Some updates after doing some testing
Add the BLP mappings
Add checks for BLP