Added port of old utilities. Error-prone and not-tested