minor refactoring
Integration with DroidFlow