Adjust class logics