Updated to handle changes for RC1