Updates to 4.0, changes namespace