adding support for nm auth, container tokens