Feature/en 1831

Since there are defaults for these, they are optional. The only required argument is the media.