Refactoring Evolution class