Added basic component classes