Added classes for v0.3b