Added basic components