Added variables and type component