Finished conversion to new API and added enum stats