New Builder Structure
Removed unused method