Refactored structure and added basic stats.