Fixed Populating nap data