Added additional components