Fix duplicated class defination