Small update with proper response codes