Adding vanila templates from 2.0 version