Sharing refactor