Address comments
Avoid using getPartialReference