Add support for trade studies
Refine support for trade studies