Added more attributes