Updated feature so it uses the correct fields