Reorganize internal communication a bit