Add draft classes