This class is not a handler so maybe we should move to another package.