Added messages as enhancments