BO template generation : After fixing the bugs