Changed version handling to be more flexible in version design