Refactor to use already implemented methods