Updated feature classes and formats