Latest updates - design and refactoring