Add Features for version 2