Enum added + some optimizations