Support update, lot of minor improvement