New dependencies and minor modification of the Aftershock entrypoint