Updated feature calculation scripts