Add some refactorings (e.g. Descriptor)
Fix conflicts