Removed Client model, added Assignment model