v0.0.2 refactored and more support