Added hack so it works with both behavior and schemaextender...