Refactored - New package ds.plato.item #125