Added more to Piece and PieceGenerator class