Other classes moved to analysis manager