diff --git a/entity-view/processor/src/main/java/com/blazebit/persistence/view/processor/ImportContextImpl.java b/entity-view/processor/src/main/java/com/blazebit/persistence/view/processor/ImportContextImpl.java
index edf7a5a4cd..c426e8fb8b 100644
--- a/entity-view/processor/src/main/java/com/blazebit/persistence/view/processor/ImportContextImpl.java
+++ b/entity-view/processor/src/main/java/com/blazebit/persistence/view/processor/ImportContextImpl.java
@@ -96,10 +96,10 @@ public String importType(String fqcn) {
             imports.add(pureFqcn);
         }
 
-        if (inSamePackage(fqcn) || (imports.contains(pureFqcn) && canBeSimple)) {
-            result = unqualify(result);
-        } else if (inJavaLang(fqcn)) {
+        if (inJavaLang(fqcn)) {
             result = result.substring("java.lang.".length());
+        } else if (inSamePackage(fqcn) || (imports.contains(pureFqcn) && canBeSimple)) {
+            result = unqualify(result);
         }
 
         if (additionalTypePart != null) {
@@ -116,16 +116,21 @@ public String importType(String fqcn) {
     private String importTypeArguments(String typeArguments, int start, int end) {
         StringBuilder sb = new StringBuilder(end - start);
         sb.append('<');
+        int currentTypeIdx = 0;
         start++;
         for (int i = start; i < end; i++) {
             final char c = typeArguments.charAt(i);
             //CHECKSTYLE:OFF: MissingSwitchDefault
             switch (c) {
                 case ',':
-                    sb.append(importType(typeArguments.substring(start, i)));
+                    if (currentTypeIdx++ > 0) {
+                        sb.append(", ");
+                    }
+                    sb.append(importType(typeArguments.substring(start, i).trim()));
                     start = i + 1;
                     break;
                 case '<':
+                    currentTypeIdx = 1;
                     int gtIdx = typeArguments.lastIndexOf('>', i);
                     sb.append(importTypeArguments(typeArguments, i, gtIdx));
                     start = gtIdx + 1;
@@ -133,7 +138,10 @@ private String importTypeArguments(String typeArguments, int start, int end) {
             }
             //CHECKSTYLE:ON: MissingSwitchDefault
         }
-        sb.append(importType(typeArguments.substring(start, end)));
+        if (currentTypeIdx > 0) {
+            sb.append(", ");
+        }
+        sb.append(importType(typeArguments.substring(start, end).trim()));
         sb.append('>');
         return sb.toString();
     }
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/ProcessorTest.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/ProcessorTest.java
index f638f23448..d71f411f9d 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/ProcessorTest.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/ProcessorTest.java
@@ -73,6 +73,12 @@ private Compilation test(Class<?>... views) {
             CompilationSubject.assertThat(compilation)
                     .generatedSourceFile(views[i].getName() + "Builder")
                     .hasSourceEquivalentTo(JavaFileObjects.forResource(views[i].getName().replace('.', '/') + "Builder.java"));
+            CompilationSubject.assertThat(compilation)
+                .generatedSourceFile(views[i].getName() + "Relation")
+                .hasSourceEquivalentTo(JavaFileObjects.forResource(views[i].getName().replace('.', '/') + "Relation.java"));
+            CompilationSubject.assertThat(compilation)
+                .generatedSourceFile(views[i].getName() + "MultiRelation")
+                .hasSourceEquivalentTo(JavaFileObjects.forResource(views[i].getName().replace('.', '/') + "MultiRelation.java"));
         }
         return compilation;
     }
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AView.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AView.java
index 4895089f06..2b4ce752a6 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AView.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AView.java
@@ -5,12 +5,14 @@
 import com.blazebit.persistence.view.EntityView;
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.MappingParameter;
+import com.blazebit.persistence.view.MappingSingular;
 import com.blazebit.persistence.view.ViewFilter;
 import com.blazebit.persistence.view.ViewFilterProvider;
 import com.blazebit.persistence.view.filter.StartsWithFilter;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
@@ -43,6 +45,9 @@ public interface AView<X extends Serializable> extends IdHolderView<Integer> {
     @MappingParameter("listMappingParameter")
     List<Object> getListMappingParameter();
 
+    @MappingSingular
+    Map<String, String> getMap();
+
     class TestFilter extends ViewFilterProvider {
 
         private static final String CONSTANT = "myParam";
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewBuilder.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewBuilder.java
index ea3ec3737a..f64d88788d 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewBuilder.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewBuilder.java
@@ -32,6 +32,7 @@ public abstract class AViewBuilder<X extends Serializable, BuilderType extends E
     protected byte[] bytes;
     protected Integer id;
     protected List<Object> listMappingParameter;
+    protected Map<String, String> map;
     protected List<Set<String>> multiNames;
     protected String name;
     protected List<String> names;
@@ -45,6 +46,7 @@ public AViewBuilder(Map<String, Object> blazePersistenceOptionalParameters) {
         this.bytes = null;
         this.id = null;
         this.listMappingParameter = (List<Object>) blazePersistenceOptionalParameters.get("listMappingParameter");
+        this.map = null;
         this.multiNames = (List<Set<String>>) (java.util.List<?>) AView_.multiNames.getCollectionInstantiator().createCollection(0);
         this.name = null;
         this.names = (List<String>) (java.util.List<?>) AView_.names.getCollectionInstantiator().createCollection(0);
@@ -94,6 +96,16 @@ public BuilderType withListMappingParameter(List<Object> listMappingParameter) {
         this.listMappingParameter = listMappingParameter;
         return (BuilderType) this;
     }
+    public Map<String, String> getMap() {
+        return map;
+    }
+    public void setMap(Map<String, String> map) {
+        this.map = map;
+    }
+    public BuilderType withMap(Map<String, String> map) {
+        this.map = map;
+        return (BuilderType) this;
+    }
     public List<Set<String>> getMultiNames() {
         return multiNames;
     }
@@ -258,6 +270,8 @@ public <ElementType> ElementType get(String attribute) {
                 return (ElementType) (Object) this.id;
             case "listMappingParameter":
                 return (ElementType) (Object) this.listMappingParameter;
+            case "map":
+                return (ElementType) (Object) this.map;
             case "multiNames":
                 return (ElementType) (Object) this.multiNames;
             case "name":
@@ -299,6 +313,9 @@ public BuilderType with(String attribute, Object value) {
             case "listMappingParameter":
                 this.listMappingParameter = value == null ? null : (List<Object>) value;
                 break;
+            case "map":
+                this.map = value == null ? null : (Map<String, String>) value;
+                break;
             case "multiNames":
                 this.multiNames = value == null ? (List<Set<String>>) (java.util.List<?>) AView_.multiNames.getCollectionInstantiator().createCollection(0) : (List<Set<String>>) value;
                 break;
@@ -541,6 +558,7 @@ public AView build() {
                     this.age,
                     this.bytes,
                     this.listMappingParameter,
+                    this.map,
                     this.multiNames,
                     this.name,
                     this.names,
@@ -581,6 +599,10 @@ public Init<X> withListMappingParameter(List<Object> listMappingParameter) {
             this.listMappingParameter = listMappingParameter;
             return (Init<X>) this;
         }
+        public Init<X> withMap(Map<String, String> map) {
+            this.map = map;
+            return (Init<X>) this;
+        }
         public Init<X> withMultiNames(List<Set<String>> multiNames) {
             this.multiNames = multiNames;
             return (Init<X>) this;
@@ -624,6 +646,9 @@ public Init<X> with(String attribute, Object value) {
                 case "listMappingParameter":
                     this.listMappingParameter = value == null ? null: (List<Object>) value;
                     break;
+                case "map":
+                    this.map = value == null ? null : (Map<String, String>) value;
+                    break;
                 case "multiNames":
                     this.multiNames = value == null ? (List<Set<String>>) (java.util.List<?>) AView_.multiNames.getCollectionInstantiator().createCollection(0) : (List<Set<String>>) value;
                     break;
@@ -920,6 +945,7 @@ public BuilderResult build() {
                     this.age,
                     this.bytes,
                     this.listMappingParameter,
+                    this.map,
                     this.multiNames,
                     this.name,
                     this.names,
@@ -961,6 +987,10 @@ public Nested<X, BuilderResult> withListMappingParameter(List<Object> listMappin
             this.listMappingParameter = listMappingParameter;
             return (Nested<X, BuilderResult>) this;
         }
+        public Nested<X, BuilderResult> withMap(Map<String, String> map) {
+            this.map = map;
+            return (Nested<X, BuilderResult>) this;
+        }
         public Nested<X, BuilderResult> withMultiNames(List<Set<String>> multiNames) {
             this.multiNames = multiNames;
             return (Nested<X, BuilderResult>) this;
@@ -1004,6 +1034,9 @@ public Nested<X, BuilderResult> with(String attribute, Object value) {
                 case "listMappingParameter":
                     this.listMappingParameter = value == null ? null : (List<Object>) value;
                     break;
+                case "map":
+                    this.map = value == null ? null : (Map<String, String>) value;
+                    break;
                 case "multiNames":
                     this.multiNames = value == null ? (List<Set<String>>) (java.util.List<?>) AView_.multiNames.getCollectionInstantiator().createCollection(0) : (List<Set<String>>) value;
                     break;
@@ -1287,4 +1320,4 @@ public <KeyType, ElementType> Nested<X, BuilderResult> withEntry(MapAttribute<AV
             throw new IllegalArgumentException("Unknown parameter index: " + parameterIndex);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewImpl.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewImpl.java
index 0785a31b8d..0ae3ef519a 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewImpl.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewImpl.java
@@ -24,6 +24,7 @@ public class AViewImpl<X extends Serializable> implements AView<X>, EntityViewPr
     private final byte[] bytes;
     private final Integer id;
     private final List<Object> listMappingParameter;
+    private final Map<String, String> map;
     private final List<Set<String>> multiNames;
     private String name;
     private final List<String> names;
@@ -36,6 +37,7 @@ public AViewImpl(AViewImpl noop, Map<String, Object> blazePersistenceOptionalPar
         this.bytes = null;
         this.id = null;
         this.listMappingParameter = (List<Object>) blazePersistenceOptionalParameters.get("listMappingParameter");
+        this.map = null;
         this.multiNames = (List<Set<String>>) (java.util.List<?>) AView_.multiNames.getCollectionInstantiator().createCollection(0);
         this.name = null;
         this.names = (List<String>) (java.util.List<?>) AView_.names.getCollectionInstantiator().createCollection(0);
@@ -50,6 +52,7 @@ public AViewImpl(Integer id) {
         this.bytes = null;
         this.id = id;
         this.listMappingParameter = null;
+        this.map = null;
         this.multiNames = (List<Set<String>>) (java.util.List<?>) AView_.multiNames.getCollectionInstantiator().createCollection(0);
         this.name = null;
         this.names = (List<String>) (java.util.List<?>) AView_.names.getCollectionInstantiator().createCollection(0);
@@ -58,12 +61,13 @@ public AViewImpl(Integer id) {
         this.test2 = null;
     }
 
-    public AViewImpl(Integer id, int age, byte[] bytes, List<Object> listMappingParameter, List<Set<String>> multiNames, String name, List<String> names, Optional<BView> optionalValue, List<X> test, X test2) {
+    public AViewImpl(Integer id, int age, byte[] bytes, List<Object> listMappingParameter, Map<String, String> map, List<Set<String>> multiNames, String name, List<String> names, Optional<BView> optionalValue, List<X> test, X test2) {
         super();
         this.age = age;
         this.bytes = bytes;
         this.id = id;
         this.listMappingParameter = listMappingParameter;
+        this.map = map;
         this.multiNames = multiNames;
         this.name = name;
         this.names = names;
@@ -78,12 +82,13 @@ public AViewImpl(AViewImpl noop, int offset, Object[] tuple) {
         this.bytes = (byte[]) tuple[offset + 2];
         this.id = (Integer) tuple[offset + 0];
         this.listMappingParameter = (List<Object>) tuple[offset + 3];
-        this.multiNames = (List<Set<String>>) tuple[offset + 4];
-        this.name = (String) tuple[offset + 5];
-        this.names = (List<String>) tuple[offset + 6];
-        this.optionalValue = (Optional<BView>) tuple[offset + 7];
-        this.test = (List<X>) tuple[offset + 8];
-        this.test2 = (X) tuple[offset + 9];
+        this.map = (Map<String, String>) tuple[offset + 4];
+        this.multiNames = (List<Set<String>>) tuple[offset + 5];
+        this.name = (String) tuple[offset + 6];
+        this.names = (List<String>) tuple[offset + 7];
+        this.optionalValue = (Optional<BView>) tuple[offset + 8];
+        this.test = (List<X>) tuple[offset + 9];
+        this.test2 = (X) tuple[offset + 10];
     }
 
     public AViewImpl(AViewImpl noop, int offset, int[] assignment, Object[] tuple) {
@@ -92,12 +97,13 @@ public AViewImpl(AViewImpl noop, int offset, int[] assignment, Object[] tuple) {
         this.bytes = (byte[]) tuple[offset + assignment[2]];
         this.id = (Integer) tuple[offset + assignment[0]];
         this.listMappingParameter = (List<Object>) tuple[offset + assignment[3]];
-        this.multiNames = (List<Set<String>>) tuple[offset + assignment[4]];
-        this.name = (String) tuple[offset + assignment[5]];
-        this.names = (List<String>) tuple[offset + assignment[6]];
-        this.optionalValue = (Optional<BView>) tuple[offset + assignment[7]];
-        this.test = (List<X>) tuple[offset + assignment[8]];
-        this.test2 = (X) tuple[offset + assignment[9]];
+        this.map = (Map<String, String>) tuple[offset + assignment[4]];
+        this.multiNames = (List<Set<String>>) tuple[offset + assignment[5]];
+        this.name = (String) tuple[offset + assignment[6]];
+        this.names = (List<String>) tuple[offset + assignment[7]];
+        this.optionalValue = (Optional<BView>) tuple[offset + assignment[8]];
+        this.test = (List<X>) tuple[offset + assignment[9]];
+        this.test2 = (X) tuple[offset + assignment[10]];
     }
 
     @Override
@@ -120,6 +126,11 @@ public List<Object> getListMappingParameter() {
         return listMappingParameter;
     }
 
+    @Override
+    public Map<String, String> getMap() {
+        return map;
+    }
+
     @Override
     public List<Set<String>> getMultiNames() {
         return multiNames;
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewMultiRelation.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewMultiRelation.java
index 1505b769b0..37e4bf8dce 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewMultiRelation.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewMultiRelation.java
@@ -1,6 +1,7 @@
 package com.blazebit.persistence.view.processor.model;
 
 import com.blazebit.persistence.view.StaticRelation;
+import com.blazebit.persistence.view.metamodel.AttributeFilterMappingPath;
 import com.blazebit.persistence.view.metamodel.AttributePath;
 import com.blazebit.persistence.view.metamodel.AttributePathWrapper;
 import com.blazebit.persistence.view.metamodel.MethodListAttribute;
@@ -10,6 +11,7 @@
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import javax.annotation.Generated;
 
@@ -41,6 +43,11 @@ public AttributePath<T, List<Object>, List<Object>> listMappingParameter() {
         return attribute == null ? getWrapped().<List<Object>>get("listMappingParameter") : getWrapped().get(attribute);
     }
 
+    public AttributePath<T, Map<String, String>, Map<String, String>> map() {
+        MethodSingularAttribute<AView, Map<String, String>> attribute = AView_.map;
+        return attribute == null ? getWrapped().<Map<String, String>>get("map") : getWrapped().get(attribute);
+    }
+
     public AttributePath<T, String, Set<String>> multiNames() {
         MethodMultiListAttribute<AView, String, Set<String>> attribute = AView_.multiNames;
         return attribute == null ? getWrapped().<String, Set<String>>getMulti("multiNames") : getWrapped().get(attribute);
@@ -75,4 +82,13 @@ public A attr() {
         return (A) getWrapped().getAttributes().get(getWrapped().getAttributes().size() - 1);
     }
 
-}
\ No newline at end of file
+    public AttributeFilterMappingPath<T, Integer> id_filter() {
+        MethodSingularAttribute<AView, Integer> attribute = AView_.id;
+        return attribute == null ? new AttributeFilterMappingPath<>(getWrapped().get("id"), "") : new AttributeFilterMappingPath<>(getWrapped().get(attribute), AView_.id_filter);
+    }
+
+    public AttributeFilterMappingPath<T, String> name_filter() {
+        MethodSingularAttribute<AView, String> attribute = AView_.name;
+        return attribute == null ? new AttributeFilterMappingPath<>(getWrapped().get("name"), "") : new AttributeFilterMappingPath<>(getWrapped().get(attribute), AView_.name_filter);
+    }
+}
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewRelation.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewRelation.java
index 8d9f0a0e57..9c108038a9 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewRelation.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AViewRelation.java
@@ -1,6 +1,7 @@
 package com.blazebit.persistence.view.processor.model;
 
 import com.blazebit.persistence.view.StaticRelation;
+import com.blazebit.persistence.view.metamodel.AttributeFilterMappingPath;
 import com.blazebit.persistence.view.metamodel.AttributePath;
 import com.blazebit.persistence.view.metamodel.AttributePathWrapper;
 import com.blazebit.persistence.view.metamodel.MethodAttribute;
@@ -9,6 +10,7 @@
 import com.blazebit.persistence.view.metamodel.MethodSingularAttribute;
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import javax.annotation.Generated;
 
@@ -40,6 +42,11 @@ public AttributePath<T, List<Object>, List<Object>> listMappingParameter() {
         return attribute == null ? getWrapped().<List<Object>>get("listMappingParameter") : getWrapped().get(attribute);
     }
 
+    public AttributePath<T, Map<String, String>, Map<String, String>> map() {
+        MethodSingularAttribute<AView, Map<String, String>> attribute = AView_.map;
+        return attribute == null ? getWrapped().<Map<String, String>>get("map") : getWrapped().get(attribute);
+    }
+
     public AttributePath<T, String, Set<String>> multiNames() {
         MethodMultiListAttribute<AView, String, Set<String>> attribute = AView_.multiNames;
         return attribute == null ? getWrapped().<String, Set<String>>getMulti("multiNames") : getWrapped().get(attribute);
@@ -74,4 +81,13 @@ public A attr() {
         return (A) getWrapped().getAttributes().get(getWrapped().getAttributes().size() - 1);
     }
 
-}
\ No newline at end of file
+    public AttributeFilterMappingPath<T, Integer> id_filter() {
+        MethodSingularAttribute<AView, Integer> attribute = AView_.id;
+        return attribute == null ? new AttributeFilterMappingPath<>(getWrapped().get("id"), "") : new AttributeFilterMappingPath<>(getWrapped().get(attribute), AView_.id_filter);
+    }
+
+    public AttributeFilterMappingPath<T, String> name_filter() {
+        MethodSingularAttribute<AView, String> attribute = AView_.name;
+        return attribute == null ? new AttributeFilterMappingPath<>(getWrapped().get("name"), "") : new AttributeFilterMappingPath<>(getWrapped().get(attribute), AView_.name_filter);
+    }
+}
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AView_.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AView_.java
index b7aa0031c3..bf0204c718 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AView_.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/AView_.java
@@ -11,6 +11,7 @@
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import javax.annotation.Generated;
 
@@ -22,6 +23,7 @@ public abstract class AView_ {
     public static volatile MethodSingularAttribute<AView, byte[]> bytes;
     public static volatile MethodSingularAttribute<AView, Integer> id;
     public static volatile MethodSingularAttribute<AView, List<Object>> listMappingParameter;
+    public static volatile MethodSingularAttribute<AView, Map<String, String>> map;
     public static volatile MethodMultiListAttribute<AView, String, Set<String>> multiNames;
     public static volatile MethodSingularAttribute<AView, String> name;
     public static volatile MethodListAttribute<AView, String> names;
@@ -35,6 +37,7 @@ public abstract class AView_ {
     public static final String BYTES = "bytes";
     public static final String ID = "id";
     public static final String LIST_MAPPING_PARAMETER = "listMappingParameter";
+    public static final String MAP = "map";
     public static final String MULTI_NAMES = "multiNames";
     public static final String NAME = "name";
     public static final String NAMES = "names";
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewMultiRelation.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewMultiRelation.java
index bf08fe2120..db2b6d1b1e 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewMultiRelation.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewMultiRelation.java
@@ -1,9 +1,9 @@
 package com.blazebit.persistence.view.processor.model;
 
 import com.blazebit.persistence.view.StaticRelation;
+import com.blazebit.persistence.view.metamodel.AttributeFilterMappingPath;
 import com.blazebit.persistence.view.metamodel.AttributePath;
 import com.blazebit.persistence.view.metamodel.AttributePathWrapper;
-import com.blazebit.persistence.view.metamodel.MethodAttribute;
 import com.blazebit.persistence.view.metamodel.MethodPluralAttribute;
 import com.blazebit.persistence.view.metamodel.MethodSingularAttribute;
 import java.util.Collection;
@@ -36,4 +36,8 @@ public A attr() {
         return (A) getWrapped().getAttributes().get(getWrapped().getAttributes().size() - 1);
     }
 
+    public AttributeFilterMappingPath<T, Integer> id_filter() {
+        MethodSingularAttribute<BView, Integer> attribute = BView_.id;
+        return attribute == null ? new AttributeFilterMappingPath<>(getWrapped().get("id"), "") : new AttributeFilterMappingPath<>(getWrapped().get(attribute), BView_.id_filter);
+    }
 }
diff --git a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewRelation.java b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewRelation.java
index b73faa05d9..992c5126cb 100644
--- a/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewRelation.java
+++ b/entity-view/processor/src/test/java/com/blazebit/persistence/view/processor/model/BViewRelation.java
@@ -1,6 +1,7 @@
 package com.blazebit.persistence.view.processor.model;
 
 import com.blazebit.persistence.view.StaticRelation;
+import com.blazebit.persistence.view.metamodel.AttributeFilterMappingPath;
 import com.blazebit.persistence.view.metamodel.AttributePath;
 import com.blazebit.persistence.view.metamodel.AttributePathWrapper;
 import com.blazebit.persistence.view.metamodel.MethodAttribute;
@@ -34,4 +35,8 @@ public A attr() {
         return (A) getWrapped().getAttributes().get(getWrapped().getAttributes().size() - 1);
     }
 
-}
\ No newline at end of file
+    public AttributeFilterMappingPath<T, Integer> id_filter() {
+        MethodSingularAttribute<BView, Integer> attribute = BView_.id;
+        return attribute == null ? new AttributeFilterMappingPath<>(getWrapped().get("id"), "") : new AttributeFilterMappingPath<>(getWrapped().get(attribute), BView_.id_filter);
+    }
+}