Various changes to the way features are integrated