Refactored to fit new Parse class