Methods added
Refactoring