More work on restoring features after moving to plugin model for datasources, no annotations work again #1276 #1472
