Some refactoring of latest classes