Refactored Media classes
Added fields to settings