Added some missing parts