Closes #362 by adding whitehat mappings.