Make Features more flexible