Add arity checks