New extension builder
Removed unused fields