Improve internal communication