Add design refactoring ideas for 5th gen