Improve RSA class