BO tmeplates: updated them as per the new domain model