Add remaining handlers for messages