A - Updates for fitting into vendor structure