Updating Structures to match master branch