Moved function to dedicated class and add label