Updated the following classes as per Mark Williams feedback