Changing to use a id property for authenticate