SSP-650 Added missing fields
Also, removed Interpreter field