Add codes for Supplier Certificate and resolved some issues