Improved version handling, extended API