Better media support in Vagabond.py file