Add shapeless