fix the classes hard code problem