Increase cyclomatic complexity to 18