Modified classes to add label