Merge TokenAuthenticatable stuff