Added In-place resource optimization