Added support of non-rabbit actions