Add in versions and architecture