IMPS version 2 OO refactor.