More refactoring to _AT() function