Implement More Changes Based on PR Response