Improve Elefanto Builder