Moved retry control to the execute method and improved javadoc