Refactoring
Added more methods