Removed TODO in favour of issues
Added base for drupal module support