Update for new features

Update for new features