Added alternative media_type handling
Cleaned up accessors
Cleaned up options