[org] improve org feature