More EF Designer mappings