Add self-message support