[development] Added new files on DRUPAL-4-7 -> a mess