Fixed class redifinition error