Added: some performance related @todos