better builder support