Fixed attributes and added some other values