Add toString() methods and missed attributes