updated classes to @0.3.0