Improve IDENT implementation