Updated trade class