More Ask refactoring