Added additional components from the Wolf Model