Add first / last name columns #1314