Exo3 refactoring