UPDATE: Changes on data obtainment logic