Add custom_fields to vapp, remove debug info