Arguments to handlers fixed workflow. Public methods fix.