Revert to allow authenticationa and associations