Fixed: occupiedBy faster indexing mechanism