Move authenticate from entity to table