Add encrypted models and terminology
Clean up generator and add comments