Added support for serial comm