Add support for skip messages