Class additions