Add name field for future
Formatting