Added more compats