-Updated to use new event handlers

-Updated API libraries