Updated to use ADK