Convert beds to the new model system