SafeMap and SafeSet added

Change-Id: I3338223269200a1fc08372c3c4c447181b5bf3a9