Enum added + small changes