Working on data structure
Fixed plist again