changed APIGeneralHandler class name to be more natural