Modified to use assignment model connection