Feature/add version selection