Restuctured and refactor
Add more reports