Refactor to AidData Lib