Added property encryption by conventions and more