Mircea: Adding cancel + refactoring