Refactored Songs resource