Made it more difficult to include all features