Updated with drupal messages