Updated to use EF Async methods