Use the right types