adopt to new API - message handling