ADD: Support for data added col, FIX: general fixes