Add Support for anonymous_mode continued