Change to Partial App Structure