Improvements on bbill templates