Updated components for features