Fixed additional features code and updated template code to use additional features.