Improve API, load more data initially