Major Updates to API