Adding support for first + last name