Added duplicative encryption. Cleanup alias methods.