Refactor and use new methods