Added some more stuff to CAD