Updated imports and RSA