U5A1, U7A2 refactoring