Updated to AdkToolkit