Various updates to add further components