extractDefinition: Allow to specify marker, expose in lib
extractDefinition: Don't assume content is JSON, allow specifying format