Some chnages to use FB data storage