Added more attributs, fixed types