Changes for using goatfish instead of redis