Data related changes

Entity framework data related changes