Replace critical method with boolean overload