Fix flavor mapping
provided dependency
Constructors
Metadata fix