Added several things