Added Character and Prop classes