Added some missing attributes