allow custom prefix key

Some minor changes to allow for a custom prefix key to be set.