Working on entity framework support