Refactoring the getter to external and internal components