Added lazy fetching of data from db