#19 GIBS-347 Legend generation updates to accomodate different use cases