Rebuilt feature model to allow extensions