Revert use of fastMap
Further updates to the BOM