Relax too strict type requirements