Small refactoring. Added KeyValuePair constructor