Feature/media expected available

Closes #56