Added retry on error to basic API