Refactoring to handle new layout