Modify Profile based on Commerce best practices + Updates