Refactoring. Added survey info in manager module