Last details on the compat module and adapted some stuff on the main module