Add CD settings and upgrade hstore lib