Migrated to Communicator class