First error management implementation
Activity collection refactoring (still in progress)
Activity collection refactoring (still in progress)