Updates in preparation for ACP add-edit page