SAN-205 Adjust Survival Analysis so that it handles new datatypes
-finished refactoring in the backend