Convert auxil functions to static methods