Use the correct Arrays
Clean up and add correct dependency on ecs
Take into account facet types