Added update support and new general config