Added encryption for entities