Add Explicitly Typed Self References