Update schemas code
Update retry interval
Minor update