Additional encoding & adding in @refs