Fix null collection or map for wrappers
Remove useless component for SerialVersionUid