Added all the missing information