Added @Encrypted support