Added some more official stuff