Support key prefixed, and make func signatures the same