Make builder more robust