Simplified using regexp
Improved partial/template cache