Added missing keys
Fixed attributes
Added bagsOfInterest; fixed reference to state