Classification and Media bundle should be optional, right ?