added basic components