Added firstname/lastname fields to core data entity