Add docker's add/drop capabilites

Add docker's add/drop capabilites