Add reference type support