Changed to have a object per request