updates for shapeless project