Get reference directly from external classes on basic modules

Change-Id: I767b1651ab1b5a9d7d741c20a2e4fb33adc41952