Added possibly necessary classes