updated Substitutable support