Added BNRMapPoint class
Slight modification