Simplify some APIs
Release 0.0.0.7