Changed to non raw formatted output.
Added BasicRef.