Template changes
Big updates in structure