Added: fix chat and IoC