Move all music collection building inside a single session / transaction