Updated Figure Frame and Rule classes.