Improve class refs

Change-Id: If7a1d9fb558e2e30295e7db696a086897237589e
Merge "Improve class refs"