aapi request builder refactor finished