New namespaces based on converstaion with EF team.