Updated to support 8.0

8.1 -> 8.0