Improved an integration with Features.