Refined define/tc macro and added first batch