Removed need for external access to companion