some changes in control handler and certificate storage