Updating to support latest changes made in titan