Mayor refactoring to add support for Audio and Pictures
fix conflict