Add key prefix option and tests