Removed eventframe dependencies for map and index