[#95] refactored using available_classes hash