Updated to classes that have moved to core, plus made some aesthetic changes