Modified handling of features. More intensive use of Templates