given that we created now so many helper classes in this PR already I wonder why this is still an inner class? Would it not make sense to make this a proper class. Also, do we need the privileged action?