update to refelct completion of built in handlers