adding command-line and certificate functionalities