Improved template loading on BP 1.6