AUT: refactoring object model