Move to using dynamic list like in the authentication sources