Some refactoring and additional methods