Refactored out payments to own collection on estate