Removed usage factory handler