Redid edmx stuffs