e30bab3324
* Use a null check instead of array check * Convert statisc to non-private * Use public source * Add public function for getting the mapping