Update trait to use new fields