diff --git a/webtester-support-assertj/src/main/java/info/novatec/testit/webtester/support/assertj/WebTesterAssertions.java b/webtester-support-assertj/src/main/java/info/novatec/testit/webtester/support/assertj/WebTesterAssertions.java
index 2b3f3b3..c25a6a6 100644
--- a/webtester-support-assertj/src/main/java/info/novatec/testit/webtester/support/assertj/WebTesterAssertions.java
+++ b/webtester-support-assertj/src/main/java/info/novatec/testit/webtester/support/assertj/WebTesterAssertions.java
@@ -1,21 +1,8 @@
 package info.novatec.testit.webtester.support.assertj;
 
+import info.novatec.testit.webtester.pageobjects.*;
 import org.assertj.core.api.Assertions;
 
-import info.novatec.testit.webtester.pageobjects.Button;
-import info.novatec.testit.webtester.pageobjects.Checkbox;
-import info.novatec.testit.webtester.pageobjects.IFrame;
-import info.novatec.testit.webtester.pageobjects.Image;
-import info.novatec.testit.webtester.pageobjects.List;
-import info.novatec.testit.webtester.pageobjects.NumberField;
-import info.novatec.testit.webtester.pageobjects.PageObject;
-import info.novatec.testit.webtester.pageobjects.RadioButton;
-import info.novatec.testit.webtester.pageobjects.Table;
-import info.novatec.testit.webtester.pageobjects.TableField;
-import info.novatec.testit.webtester.pageobjects.TableRow;
-import info.novatec.testit.webtester.pageobjects.TextArea;
-import info.novatec.testit.webtester.pageobjects.TextField;
-
 
 /**
  * Entry point for assertion methods for different WebTester {@link PageObject
@@ -79,6 +66,10 @@ public static TextFieldAssert assertThat(TextField actual) {
         return new TextFieldAssert(actual);
     }
 
+    public static GenericTextFieldAssert assertThat(GenericTextField actual) {
+        return new GenericTextFieldAssert(actual);
+    }
+
     private WebTesterAssertions() {
         // utility constructor
     }