Further builder enhancements