Be more consistent and use a function if it's there