#20 Add ReferenceHandler