handle parsing/adapt to new schema
draft fancy version