Added more version classes