certificates refactor, few new certificates added