Added default value for entries
Cleanup