Updating for new ADT