[WIP] Feature/compatibility improve