Resolved namespace issues for static / templates