Use the new extension function