Removed dependency from java.util.Map interface. Not all methods of it is needed.