Changed behaviour of lookup to accomodate Option[Piece]