Added support to unsupported message and unit-tests