2.17.1-3: Oil lamp conversion class