Updated for 8.1 and fixed enumeration bug