Performance improvements commit