added subcontext to amounts and scopes