Improve share action