Issue #87 and Issue #66 - EFA-Tokens-Cron