Updated to use Iglu-specific self-describing