fixing error message
Refactoring the changes for custom_info
Refactoring for system custom_info