Better handling of api versions