Enhanced components