Template & YAML framework added