Move to dedicated class