Major changes to don_utils API