Change convention mappings to use MemberInfo