Adding a TODO note and the missing attribute to validation
Formatting and adding errors validation