Adjust final for loading builders and removed manual 'include'