Minor
Proper descriptor parser
Add test for base field