Added functor, parametrized ECS