Add version && package version support to discovery