Improved version system