Rework on template bo for extras