Simplify logic of super helper