Beginning to update System class