Remove media_type and annotate attributes from Input