Enhancement: Missed a few variables