Added action message support. Minor fixes