Updated with more base templates