Now works as before using APService object