Updates for CodeFirst changes