2.17.1-4: Oil lamp conversion class