Added support for middleName