Improve binding builder