Package updated to include marshal