Add DEFAULT_PUBLICLY_AVAILABLE and DEFAULT_PUBLIC_IDENTIFIER