Modify method calls in A1 client