Separated methods into new file