Modifications to enable chat app