Added support for key-prefix option