Added basic components and thermal expansion