Replace contentId with a OptionsResolver
Multi-formats and options support