Refactored AMP to support anubis integration into the clients.