diff --git a/teavm-dom/src/main/java/org/teavm/dom/html/HTMLMediaElement.java b/teavm-dom/src/main/java/org/teavm/dom/html/HTMLMediaElement.java
index e3df3e8d8..fb67616bc 100644
--- a/teavm-dom/src/main/java/org/teavm/dom/html/HTMLMediaElement.java
+++ b/teavm-dom/src/main/java/org/teavm/dom/html/HTMLMediaElement.java
@@ -31,16 +31,16 @@ import org.teavm.jso.JSProperty;
  */
 public interface HTMLMediaElement extends HTMLElement {
 
-    public static final int HAVE_NOTHING = 0;
-    public static final int HAVE_METADATA = 1;
-    public static final int HAVE_CURRENT_DATA = 2;
-    public static final int HAVE_FUTURE_DATA = 3;
-    public static final int HAVE_ENOUGH_DATA = 4;
+    int HAVE_NOTHING = 0;
+    int HAVE_METADATA = 1;
+    int HAVE_CURRENT_DATA = 2;
+    int HAVE_FUTURE_DATA = 3;
+    int HAVE_ENOUGH_DATA = 4;
 
-    public static final int NETWORK_EMPTY = 0;
-    public static final int NETWORK_IDLE = 1;
-    public static final int NETWORK_LOADING = 2;
-    public static final int NETWORK_NO_SOURCE = 3;
+    int NETWORK_EMPTY = 0;
+    int NETWORK_IDLE = 1;
+    int NETWORK_LOADING = 2;
+    int NETWORK_NO_SOURCE = 3;
 
     @JSProperty
     MediaError getError();
@@ -55,10 +55,10 @@ public interface HTMLMediaElement extends HTMLElement {
     String getCurrentSrc();
 
     @JSProperty
-    void setCurrentSrc(String currentSrc);
+    String getCrossOrigin();
 
     @JSProperty
-    String getCrossOrigin();
+    void setCrossOrigin(String crossOrigin);
 
     @JSProperty
     int getNetworkState();
@@ -88,10 +88,10 @@ public interface HTMLMediaElement extends HTMLElement {
     double getDuration();
 
     @JSProperty
-    Date getStartOffsetTime();
+    Date getStartDate();
 
     @JSProperty
-    boolean getPaused();
+    boolean isPaused();
 
     @JSProperty
     double getDefaultPlaybackRate();
@@ -112,38 +112,43 @@ public interface HTMLMediaElement extends HTMLElement {
     TimeRanges getSeekable();
 
     @JSProperty
-    boolean getEnded();
+    boolean isEnded();
 
     @JSProperty
     boolean isAutoplay();
 
     @JSProperty
     void setAutoplay(boolean autoplay);
-    
+
+    @JSProperty
     boolean isLoop();
-    
+
+    @JSProperty
     void setLoop(boolean loop);
-    
+
     @JSProperty
     String getMediaGroup();
 
+    @JSProperty
+    void setMediaGroup(String mediaGroup);
+
     @JSProperty
     MediaController getController();
 
     @JSProperty
-    void setController(MediaController controller);    
+    void setController(MediaController controller);
 
     @JSProperty
-    boolean getControlls();
+    boolean isControls();
 
     @JSProperty
-    void setControlls(boolean controlls);
+    void setControls(boolean controls);
 
     @JSProperty
     float getVolume();
 
     @JSProperty
-    void setVolume(float volume);    
+    void setVolume(float volume);
 
     @JSProperty
     boolean isMuted();
@@ -156,11 +161,11 @@ public interface HTMLMediaElement extends HTMLElement {
 
     @JSProperty
     void setDefaultMuted(boolean defaultMuted);
-    
+
     AudioTrackList getAudioTracks();
-    
+
     VideoTrackList getVideoTracks();
-    
+
     TextTrackList getTextTracks();
 
     TextTrack addTextTrack(String kind);
diff --git a/teavm-dom/src/main/java/org/teavm/dom/html/HTMLVideoElement.java b/teavm-dom/src/main/java/org/teavm/dom/html/HTMLVideoElement.java
index 94670612f..4606cdbef 100644
--- a/teavm-dom/src/main/java/org/teavm/dom/html/HTMLVideoElement.java
+++ b/teavm-dom/src/main/java/org/teavm/dom/html/HTMLVideoElement.java
@@ -27,10 +27,10 @@ public interface HTMLVideoElement extends HTMLMediaElement {
     int getWidth();
 
     @JSProperty
-    void setWidth(int width);
+    int getHeight();
 
     @JSProperty
-    int getHeight();
+    void setWidth(int width);
 
     @JSProperty
     void setHeight(int height);
@@ -38,15 +38,12 @@ public interface HTMLVideoElement extends HTMLMediaElement {
     @JSProperty
     int getVideoWidth();
 
-    @JSProperty
-    void setVideoWidth(int videoWidth);
-
     @JSProperty
     int getVideoHeight();
 
-    @JSProperty
-    void setVideoHeight(int videoHeight);
-
     @JSProperty
     String getPoster();
+    
+    @JSProperty
+    void setPoster(String poster);
 }
diff --git a/teavm-dom/src/main/java/org/teavm/dom/media/AudioTrack.java b/teavm-dom/src/main/java/org/teavm/dom/media/AudioTrack.java
index bab464715..7d9b28a1c 100644
--- a/teavm-dom/src/main/java/org/teavm/dom/media/AudioTrack.java
+++ b/teavm-dom/src/main/java/org/teavm/dom/media/AudioTrack.java
@@ -1,27 +1,28 @@
 /*
- * Copyright 2015 Alexey Andreev.
+ *  Copyright 2014 Alexey Andreev.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 package org.teavm.dom.media;
 
+import org.teavm.jso.JSObject;
 import org.teavm.jso.JSProperty;
 
 /**
  *
  * @author Junji Takakura
  */
-public interface AudioTrack {
+public interface AudioTrack extends JSObject {
 
     @JSProperty
     String getId();
diff --git a/teavm-dom/src/main/java/org/teavm/dom/media/AudioTrackList.java b/teavm-dom/src/main/java/org/teavm/dom/media/AudioTrackList.java
index 054709595..183da8c40 100644
--- a/teavm-dom/src/main/java/org/teavm/dom/media/AudioTrackList.java
+++ b/teavm-dom/src/main/java/org/teavm/dom/media/AudioTrackList.java
@@ -1,31 +1,28 @@
 /*
- * Copyright 2015 Alexey Andreev.
+ *  Copyright 2014 Alexey Andreev.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 package org.teavm.dom.media;
 
 import org.teavm.dom.events.EventTarget;
-import org.teavm.jso.JSProperty;
+import org.teavm.jso.JSArrayReader;
 
 /**
  *
  * @author Junji Takakura
  */
-public interface AudioTrackList extends EventTarget {
-    @JSProperty
-    int getLength();
-    
-    AudioTrack item(int index);
+public interface AudioTrackList extends EventTarget, JSArrayReader<AudioTrack> {
+
     AudioTrack getTrackById(String id);
 }
diff --git a/teavm-dom/src/main/java/org/teavm/dom/media/MediaController.java b/teavm-dom/src/main/java/org/teavm/dom/media/MediaController.java
index b1127d35a..6b4da6394 100644
--- a/teavm-dom/src/main/java/org/teavm/dom/media/MediaController.java
+++ b/teavm-dom/src/main/java/org/teavm/dom/media/MediaController.java
@@ -1,17 +1,17 @@
 /*
- * Copyright 2015 Alexey Andreev.
+ *  Copyright 2014 Alexey Andreev.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 package org.teavm.dom.media;
 
@@ -78,6 +78,4 @@ public interface MediaController extends JSObject {
     void play();
 
     void pause();
-
-    void unpause();
 }
diff --git a/teavm-dom/src/main/java/org/teavm/dom/media/MediaError.java b/teavm-dom/src/main/java/org/teavm/dom/media/MediaError.java
index 704b4c707..a7d22b1a7 100644
--- a/teavm-dom/src/main/java/org/teavm/dom/media/MediaError.java
+++ b/teavm-dom/src/main/java/org/teavm/dom/media/MediaError.java
@@ -1,17 +1,17 @@
 /*
- * Copyright 2015 Alexey Andreev.
+ *  Copyright 2014 Alexey Andreev.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 package org.teavm.dom.media;
 
@@ -24,10 +24,10 @@ import org.teavm.jso.JSProperty;
  */
 public interface MediaError extends JSObject {
 
-    public static final int MEDIA_ERR_ABORTED = 1;
-    public static final int MEDIA_ERR_NETWORK = 2;
-    public static final int MEDIA_ERR_DECODE = 3;
-    public static final int MEDIA_ERR_SRC_NOT_SUPPORTED = 4;
+    int MEDIA_ERR_ABORTED = 1;
+    int MEDIA_ERR_NETWORK = 2;
+    int MEDIA_ERR_DECODE = 3;
+    int MEDIA_ERR_SRC_NOT_SUPPORTED = 4;
 
     @JSProperty
     int getCode();
diff --git a/teavm-dom/src/main/java/org/teavm/dom/media/TextTrack.java b/teavm-dom/src/main/java/org/teavm/dom/media/TextTrack.java
index ddccc8fc8..f34fedd30 100644
--- a/teavm-dom/src/main/java/org/teavm/dom/media/TextTrack.java
+++ b/teavm-dom/src/main/java/org/teavm/dom/media/TextTrack.java
@@ -1,31 +1,32 @@
 /*
- * Copyright 2015 Alexey Andreev.
+ *  Copyright 2014 Alexey Andreev.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 package org.teavm.dom.media;
 
+import org.teavm.dom.events.EventTarget;
 import org.teavm.jso.JSProperty;
 
 /**
  *
  * @author Junji Takakura
  */
-public interface TextTrack {
+public interface TextTrack extends EventTarget {
 
-    public static final String DISABLED = "disabled";
-    public static final String HIDDEN = "hidden";
-    public static final String SHOWING = "showing";
+    String DISABLED = "disabled";
+    String HIDDEN = "hidden";
+    String SHOWING = "showing";
 
     @JSProperty
     String getId();
@@ -45,12 +46,6 @@ public interface TextTrack {
     @JSProperty
     void setMode(String mode);
 
-    @JSProperty
-    boolean isEnabled();
-
-    @JSProperty
-    void setEnabled(boolean enabled);
-
     @JSProperty
     TextTrackCueList getCues();
 
diff --git a/teavm-dom/src/main/java/org/teavm/dom/media/TextTrackCue.java b/teavm-dom/src/main/java/org/teavm/dom/media/TextTrackCue.java
index 8bd4b05ab..959b92ebf 100644
--- a/teavm-dom/src/main/java/org/teavm/dom/media/TextTrackCue.java
+++ b/teavm-dom/src/main/java/org/teavm/dom/media/TextTrackCue.java
@@ -1,20 +1,21 @@
 /*
- * Copyright 2015 Alexey Andreev.
+ *  Copyright 2014 Alexey Andreev.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 package org.teavm.dom.media;
 
+import org.teavm.dom.core.DocumentFragment;
 import org.teavm.dom.events.EventTarget;
 import org.teavm.jso.JSProperty;
 
@@ -24,21 +25,74 @@ import org.teavm.jso.JSProperty;
  */
 public interface TextTrackCue extends EventTarget {
 
+    @JSProperty
+    TextTrack getTrack();
+
     @JSProperty
     String getId();
 
+    @JSProperty
+    void setId(String id);
+
     @JSProperty
     double getStartTime();
 
+    @JSProperty
+    void setStartTime(double startTime);
+
     @JSProperty
     double getEndTime();
 
+    @JSProperty
+    void setEndTime(double endTime);
+
     @JSProperty
     boolean isPauseOnExit();
 
+    @JSProperty
+    void setPauseOnExit(boolean pauseOnExit);
+
+    @JSProperty
+    String getVertical();
+
+    @JSProperty
+    void setVertical(String vertical);
+
+    @JSProperty
+    boolean isSnapToLines();
+
+    @JSProperty
+    void setSnapToLines(boolean snapToLines);
+
+    @JSProperty
+    int getLine();
+
+    @JSProperty
+    void setLine(int line);
+
+    @JSProperty
+    int getPosition();
+
+    @JSProperty
+    void setPosition(int position);
+
+    @JSProperty
+    int getSize();
+
+    @JSProperty
+    void setSize(int size);
+
+    @JSProperty
+    String getAlign();
+
+    @JSProperty
+    void setAlign(String align);
+
     @JSProperty
     String getText();
 
     @JSProperty
-    TextTrack getTrack();
+    void setText(String text);
+
+    DocumentFragment getCueAsHTML();
 }
diff --git a/teavm-dom/src/main/java/org/teavm/dom/media/TextTrackCueList.java b/teavm-dom/src/main/java/org/teavm/dom/media/TextTrackCueList.java
index 72e0b36b0..f3becb0be 100644
--- a/teavm-dom/src/main/java/org/teavm/dom/media/TextTrackCueList.java
+++ b/teavm-dom/src/main/java/org/teavm/dom/media/TextTrackCueList.java
@@ -1,33 +1,28 @@
 /*
- * Copyright 2015 Alexey Andreev.
+ *  Copyright 2014 Alexey Andreev.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 package org.teavm.dom.media;
 
+import org.teavm.jso.JSArrayReader;
 import org.teavm.jso.JSObject;
-import org.teavm.jso.JSProperty;
 
 /**
  *
  * @author Junji Takakura
  */
-public interface TextTrackCueList extends JSObject {
+public interface TextTrackCueList extends JSObject, JSArrayReader<TextTrackCue> {
 
-    @JSProperty
-    int getLength();
-
-    TextTrackCue item(int index);
-
-    TextTrackCue getTrackById(String id);
+    TextTrackCue getCueById(String id);
 }
diff --git a/teavm-dom/src/main/java/org/teavm/dom/media/TextTrackList.java b/teavm-dom/src/main/java/org/teavm/dom/media/TextTrackList.java
index f625e66f0..08ae391df 100644
--- a/teavm-dom/src/main/java/org/teavm/dom/media/TextTrackList.java
+++ b/teavm-dom/src/main/java/org/teavm/dom/media/TextTrackList.java
@@ -1,33 +1,28 @@
 /*
- * Copyright 2015 Alexey Andreev.
+ *  Copyright 2014 Alexey Andreev.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 package org.teavm.dom.media;
 
 import org.teavm.dom.events.EventTarget;
-import org.teavm.jso.JSProperty;
+import org.teavm.jso.JSArrayReader;
 
 /**
  *
  * @author Junji Takakura
  */
-public interface TextTrackList extends EventTarget {
-
-    @JSProperty
-    int getLength();
-
-    TextTrack item(int index);
+public interface TextTrackList extends EventTarget, JSArrayReader<TextTrack> {
 
     TextTrack getTrackById(String id);
 }
diff --git a/teavm-dom/src/main/java/org/teavm/dom/media/TimeRanges.java b/teavm-dom/src/main/java/org/teavm/dom/media/TimeRanges.java
index c0dd0594d..4b032f235 100644
--- a/teavm-dom/src/main/java/org/teavm/dom/media/TimeRanges.java
+++ b/teavm-dom/src/main/java/org/teavm/dom/media/TimeRanges.java
@@ -1,17 +1,17 @@
 /*
- * Copyright 2015 Alexey Andreev.
+ *  Copyright 2014 Alexey Andreev.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 package org.teavm.dom.media;
 
diff --git a/teavm-dom/src/main/java/org/teavm/dom/media/VideoTrack.java b/teavm-dom/src/main/java/org/teavm/dom/media/VideoTrack.java
index 199d26ffc..4eb574bee 100644
--- a/teavm-dom/src/main/java/org/teavm/dom/media/VideoTrack.java
+++ b/teavm-dom/src/main/java/org/teavm/dom/media/VideoTrack.java
@@ -1,27 +1,28 @@
 /*
- * Copyright 2015 Alexey Andreev.
+ *  Copyright 2014 Alexey Andreev.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 package org.teavm.dom.media;
 
+import org.teavm.jso.JSObject;
 import org.teavm.jso.JSProperty;
 
 /**
  *
  * @author Junji Takakura
  */
-public interface VideoTrack {
+public interface VideoTrack extends JSObject {
 
     @JSProperty
     String getId();
diff --git a/teavm-dom/src/main/java/org/teavm/dom/media/VideoTrackList.java b/teavm-dom/src/main/java/org/teavm/dom/media/VideoTrackList.java
index 232712304..fa3ead641 100644
--- a/teavm-dom/src/main/java/org/teavm/dom/media/VideoTrackList.java
+++ b/teavm-dom/src/main/java/org/teavm/dom/media/VideoTrackList.java
@@ -1,36 +1,32 @@
 /*
- * Copyright 2015 Alexey Andreev.
+ *  Copyright 2014 Alexey Andreev.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 package org.teavm.dom.media;
 
 import org.teavm.dom.events.EventTarget;
+import org.teavm.jso.JSArrayReader;
 import org.teavm.jso.JSProperty;
 
 /**
  *
  * @author Junji Takakura
  */
-public interface VideoTrackList extends EventTarget {
-
-    @JSProperty
-    int getLength();
+public interface VideoTrackList extends EventTarget, JSArrayReader<VideoTrack> {
 
     @JSProperty
     int getSelectedIndex();
 
-    VideoTrack item(int index);
-
     VideoTrack getTrackById(String id);
 }