Implement changes from review