Feature/compatibility mode