Removed unnecessary data structure in order to optimize load time by reducing packet transfer