A few drush todos
Add support for restoring more components