New: works on entity management