Logic classes changes