[IMP] Some improvements