Some improvements
Add setup