Adapted to eapptools refactoring