Change empty class management