adding next version support