Simplify API
Update artifacts
Fix multiple issue and test it
Update artifacts