can we make this use containers.IdentifierPrefix ?