Moved methods to individual files