Add comments and add label class