Improve descriptor builder interface
Improve build