2-way binding and better build configuration