adopted Graphic and Frame refactoring