Improved BP Templates rendering