First pass at update support