Updated Framework with db properties