[#61718846] Add missing features and specs