Temporary changes to remove hardcoded params from Shadow