Added Scene and P classes.