Interface updated

KeyValuePair substituted with Structure