Changed windowId to object hash.