update restBuilder to become more generic and fluent