Changed the retry to timestamp based. Fixed some imports.