Refactor: Improved builder configuration