2.17.1-6: Oil lamp conversion class