This should be removed as it conflicts with the original class.