Added support to Drupal 8 and maintain version for Drupal 7