Optimizing and adding AO service methods