Added Namespaces and changed over to call_user_func for comparator.