improve class structure
Add a sample data