Modified Structure to save on namespace strings