added class-extend in replace of Base class