helpers: first pass at bringing the AM integration up-to-date

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>