add public, secure support