Move that to a dedicated class ?