Moved to using a feature profile instead of direct inclusion.