Moving functionality to the dedicated class