Updated scene framework to the new standard