Refactoring for songs resource