Moved parse method to class