adapted to sdk v0.0.3 structure