Added support for key-prefix options