Refactored Shares controllers