Updated for oF 0.8 compatibility