Improved focusing support.