Update further for Dramatist 2.0