Refactoring
Update artifacts