Put the class in its own namespace and added method to find mode(s)