Use a function instead of a wrapper