Added multi column mapping, and some bug fix over deactivation worker