Added some Missing stuff