Added option of specifying an ID for Metadata generation. Useful when working with IdPs where ID and entityId can not be the same.