artf42340 : Database - Metadata improvements