Updated components for bug 900908