rebuild API data mocks, fix thread issue, fix date issue
Fix merge conflicts