Add TradingAxis and Sample. Fix Axis compilation