Add support for different key types for map collections
Add remove collection entity support for maps