Initial support for self-signed keys