Minor updates
Modified for Jasypt