Updated general classes to newest draft (v0.4a).