Updated transaction for current version, added option for retry on empty messages