Adding enumerations, fixing logout