Changed: isolate enter/exit optimization