Update changes with recent additions