Improved management of empty states
Metadata change