added actual classes instead of aliasses