Added additional components and libraries