Improve reconciliation [split to multi files] & fix some bug