ecs mock and some other changes