Added 'templates' and 'views' handling