Some changes
Add some methods