Develop

Some modernizations in getting data.