Feature/add version compat