refactor: update to new instance structure.