Added entity framework feature