Update for new instance syntax