Converted builders to be lazy-loaded