Refactoring of representations and application class