Changes to try to make Features more memory efficient