working on adding gateway based meta data