Added missing attributes and changed some erroneous types