Add BC checks for firstName and lastName