Added conditionnal wrapper for classes than contains descriptors
Harmonise and simplify imports
Update imports changes in documentation