Added support for modules
Added support for ping-pong