#23030563390859 Generalize created functionality