Fixed typo.
Use new API and make loading data faster.