Added arity support + name for debugging