Add some more basic parts