Move namespaces to util
Add missing util
Use primitive predicate in parameter count