Added support for CAS-only and auto-registration