Improved version schema