Feature/ami 403

Feature required for drop-in replacement of asgard functionality