Small changes
Add some types