Added template classes and bundle, target