Added set substitution