Suite internal refactor
Before in suite