Added rules for first / last names