Updated for latest changes