Changed class to static so that it can be serialized