Re-added Builder helpers and template file