Issue16 and sync with safetymapsDBK