Updated general classes to v0.4a.